From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 2 Jun 2023 02:12:34 +0000 (+0200)
Subject: dbusServices/extensions: Load preferences as module
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~337^2~1^2~180
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=972a3b2d44938ea4d148279c0978f0e66a7bc381;p=gnome-shell.git

dbusServices/extensions: Load preferences as module

Now that extensions themselves are imported as modules, do the
same for their preference dialogs.

Extensions must now export a class with a `fillPreferencesWindow()`
method as default.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2795>
---

diff --git a/js/dbusServices/extensions/extensionPrefsDialog.js b/js/dbusServices/extensions/extensionPrefsDialog.js
index a16476e78..404cbbeac 100644
--- a/js/dbusServices/extensions/extensionPrefsDialog.js
+++ b/js/dbusServices/extensions/extensionPrefsDialog.js
@@ -18,29 +18,24 @@ export const ExtensionPrefsDialog = GObject.registerClass({
             search_enabled: false,
         });
 
-        try {
-            ExtensionUtils.installImporter(extension);
+        this._loadPrefs(extension).catch(e => {
+            this._showErrorPage(e);
+            logError(e, 'Failed to open preferences');
+        });
+    }
 
-            // give extension prefs access to their own extension object
-            ExtensionUtils.setCurrentExtension(extension);
+    async _loadPrefs(extension) {
+        // give extension prefs access to their own extension object
+        ExtensionUtils.setCurrentExtension(extension);
 
-            const prefsModule = extension.imports.prefs;
-            prefsModule.init(extension.metadata);
+        const prefsJs = extension.dir.get_child('prefs.js');
+        const prefsModule = await import(prefsJs.get_uri());
 
-            if (prefsModule.fillPreferencesWindow) {
-                prefsModule.fillPreferencesWindow(this);
+        const prefsObj = new prefsModule.default(extension.metadata);
+        prefsObj.fillPreferencesWindow(this);
 
-                if (!this.visible_page)
-                    throw new Error('Extension did not provide any UI');
-            } else {
-                const widget = prefsModule.buildPrefsWidget();
-                const page = this._wrapWidget(widget);
-                this.add(page);
-            }
-        } catch (e) {
-            this._showErrorPage(e);
-            logError(e, 'Failed to open preferences');
-        }
+        if (!this.visible_page)
+            throw new Error('Extension did not provide any UI');
     }
 
     set titlebar(w) {
@@ -64,23 +59,6 @@ export const ExtensionPrefsDialog = GObject.registerClass({
         const extension = ExtensionUtils.getCurrentExtension();
         this.add(new ExtensionPrefsErrorPage(extension, e));
     }
-
-    _wrapWidget(widget) {
-        if (widget instanceof Adw.PreferencesPage)
-            return widget;
-
-        const page = new Adw.PreferencesPage();
-        if (widget instanceof Adw.PreferencesGroup) {
-            page.add(widget);
-            return page;
-        }
-
-        const group = new Adw.PreferencesGroup();
-        group.add(widget);
-        page.add(group);
-
-        return page;
-    }
 });
 
 const ExtensionPrefsErrorPage = GObject.registerClass({